x11: Remove GdkDrawableImplX11

It's not use anymore, the whole functionality has been moved to
GdkWindowImplX11.

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 9a48fe804221ec1b4d130728b0d0d0e7999e2471..f4606b94cf6c2675f3972519e935f92713147755 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -202,7 +202,6 @@ x11_introspection_files =           \
        x11/gdkdevice-xi.c              \
        x11/gdkdisplay-x11.c            \
        x11/gdkdnd-x11.c                \
-       x11/gdkdrawable-x11.c           \
        x11/gdkeventsource.c            \
        x11/gdkeventtranslator.c        \
        x11/gdkgeometry-x11.c           \

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 6344754597fdd6652e7f8a26b504be2e264998f3..b6a4751b328571401eac845a77d76a16dbe463ca 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -30,8 +30,6 @@ libgdk_x11_la_SOURCES =       \
        gdkdisplay-x11.c        \
        gdkdisplay-x11.h        \
        gdkdnd-x11.c            \
-       gdkdrawable-x11.c       \
-       gdkdrawable-x11.h       \
        gdkeventsource.c        \
        gdkeventsource.h        \
        gdkeventtranslator.c    \

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
deleted file mode 100644 (file)
index 4db0fd5..0000000
--- a/gdk/x11/gdkdrawable-x11.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#include "config.h"
-
-#include "gdkdrawable-x11.h"
-
-#include "gdkx.h"
-#include "gdkprivate-x11.h"
-#include "gdkscreen-x11.h"
-#include "gdkdisplay-x11.h"
-
-#include <cairo-xlib.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-
-G_DEFINE_TYPE (GdkDrawableImplX11, _gdk_drawable_impl_x11, GDK_TYPE_DRAWABLE)
-
-static void
-_gdk_drawable_impl_x11_class_init (GdkDrawableImplX11Class *klass)
-{
-}
-
-static void
-_gdk_drawable_impl_x11_init (GdkDrawableImplX11 *impl)
-{
-}
-

diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h
deleted file mode 100644 (file)
index 03c621e..0000000
--- a/gdk/x11/gdkdrawable-x11.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_DRAWABLE_X11_H__
-#define __GDK_DRAWABLE_X11_H__
-
-#include <gdk/gdkdrawable.h>
-#include <X11/Xlib.h>
-
-G_BEGIN_DECLS
-
-/* Drawable implementation for X11
- */
-
-typedef struct _GdkDrawableImplX11 GdkDrawableImplX11;
-typedef struct _GdkDrawableImplX11Class GdkDrawableImplX11Class;
-
-#define GDK_TYPE_DRAWABLE_IMPL_X11              (_gdk_drawable_impl_x11_get_type ())
-#define GDK_DRAWABLE_IMPL_X11(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAWABLE_IMPL_X11, GdkDrawableImplX11))
-#define GDK_DRAWABLE_IMPL_X11_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAWABLE_IMPL_X11, GdkDrawableImplX11Class))
-#define GDK_IS_DRAWABLE_IMPL_X11(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAWABLE_IMPL_X11))
-#define GDK_IS_DRAWABLE_IMPL_X11_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAWABLE_IMPL_X11))
-#define GDK_DRAWABLE_IMPL_X11_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAWABLE_IMPL_X11, GdkDrawableImplX11Class))
-
-struct _GdkDrawableImplX11
-{
-  GdkDrawable parent_instance;
-};
- 
-struct _GdkDrawableImplX11Class 
-{
-  GdkDrawableClass parent_class;
-
-};
-
-GType _gdk_drawable_impl_x11_get_type (void);
-
-
-G_END_DECLS
-
-#endif /* __GDK_DRAWABLE_X11_H__ */

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 7e3e810c9071a464d00c04575b88b039d301ec59..1435fdf94b505b324da5052798c24036f38cc685 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -130,7 +130,7 @@ static void        gdk_window_impl_iface_init     (GdkWindowImplIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GdkWindowImplX11,
                          gdk_window_impl_x11,
-                         GDK_TYPE_DRAWABLE_IMPL_X11,
+                         GDK_TYPE_DRAWABLE,
                          G_IMPLEMENT_INTERFACE (GDK_TYPE_WINDOW_IMPL,
                                                 gdk_window_impl_iface_init));
 

diff --git a/gdk/x11/gdkwindow-x11.h b/gdk/x11/gdkwindow-x11.h
index 77eb32b49c23d9f52008c56b6926d40c71a871e5..570a9572a3321dd107ae4275f485dd88f75d3287 100644 (file)
--- a/gdk/x11/gdkwindow-x11.h
+++ b/gdk/x11/gdkwindow-x11.h
@@ -27,7 +27,7 @@
 #ifndef __GDK_WINDOW_X11_H__
 #define __GDK_WINDOW_X11_H__
 
-#include <gdk/x11/gdkdrawable-x11.h>
+#include "gdk/x11/gdkprivate-x11.h"
 
 #ifdef HAVE_XDAMAGE
 #include <X11/extensions/Xdamage.h>
@@ -56,7 +56,7 @@ typedef struct _GdkXPositionInfo GdkXPositionInfo;
 
 struct _GdkWindowImplX11
 {
-  GdkDrawableImplX11 parent_instance;
+  GdkDrawable parent_instance;
 
   GdkDrawable *wrapper;
 
@@ -81,7 +81,7 @@ struct _GdkWindowImplX11
  
 struct _GdkWindowImplX11Class 
 {
-  GdkDrawableImplX11Class parent_class;
+  GdkDrawableClass parent_class;
 };
 
 struct _GdkToplevelX11